Auto merge of #4141 - Keruspe:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 7 Jun 2017 19:40:14 +0000 (19:40 +0000)
committerbors <bors@rust-lang.org>
Wed, 7 Jun 2017 19:40:14 +0000 (19:40 +0000)
update git2

Fixes build with libressl


Trivial merge